merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 4 Oct 2010 05:53:32 +0000 (14:53 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 4 Oct 2010 05:53:32 +0000 (14:53 +0900)
commit45edaf56566d55b0db7a2d0dab10648e8f7347e2
tree3b00dbb2982eb95095f8269dfec3a31f495e24d2
parenta0b06f1f6eaa72b02d8cfa046a95e07a6e97a4c2
parent018b3a0c5268ea97fc332743d10097889ae31f71
merge trunk